longpress: Use xsettings to determine long press duration

GtkSettings::gtk-long-press-time is used to this effect.

diff --git a/gtk/gtkgesturelongpress.c b/gtk/gtkgesturelongpress.c
index 7c67fc1548f92c2adda4f51b6f79ae9c60805ee9..72637765a09951ba9b30c71ffd54f9048bec7617 100644 (file)
--- a/gtk/gtkgesturelongpress.c
+++ b/gtk/gtkgesturelongpress.c
@@ -24,8 +24,6 @@
 #include "gtkprivate.h"
 #include "gtkintl.h"
 
-#define DEFAULT_TRIGGER_DELAY 500
-
 typedef struct _GtkGestureLongPressPrivate GtkGestureLongPressPrivate;
 
 enum {
@@ -92,6 +90,8 @@ gtk_gesture_long_press_begin (GtkGesture       *gesture,
 {
   GtkGestureLongPressPrivate *priv;
   const GdkEvent *event;
+  GtkWidget *widget;
+  gint delay;
 
   priv = gtk_gesture_long_press_get_instance_private (GTK_GESTURE_LONG_PRESS (gesture));
   sequence = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (gesture));
@@ -102,10 +102,14 @@ gtk_gesture_long_press_begin (GtkGesture       *gesture,
        event->type != GDK_TOUCH_BEGIN))
     return;
 
+  widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
+  g_object_get (gtk_widget_get_settings (widget),
+               "gtk-long-press-time", &delay, NULL);
+
   gtk_gesture_get_point (gesture, sequence,
                          &priv->initial_x, &priv->initial_y);
   priv->timeout_id =
-    gdk_threads_add_timeout (DEFAULT_TRIGGER_DELAY,
+    gdk_threads_add_timeout (delay,
                              _gtk_gesture_long_press_timeout,
                              gesture);
 }